From 7eb131fdf17c161520f3eea3ab9d4ac6801f4cd1 Mon Sep 17 00:00:00 2001 From: James Henstridge Date: Thu, 11 Oct 2001 02:44:17 +0000 Subject: [PATCH] add AS=CC and ASFLAGS=CFLAGS substitutions so that gtk+ can be built with 2001-10-11 James Henstridge * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so that gtk+ can be built with automake 1.5 while not breaking things for automake 1.4. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ configure.in | 6 ++++++ 8 files changed, 48 insertions(+) diff --git a/ChangeLog b/ChangeLog index ac9a9e96d6..1cc7cce3c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-10-11 James Henstridge + + * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so + that gtk+ can be built with automake 1.5 while not breaking + things for automake 1.4. + Wed Oct 10 12:48:38 2001 Owen Taylor * gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, ""). diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ac9a9e96d6..1cc7cce3c3 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-10-11 James Henstridge + + * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so + that gtk+ can be built with automake 1.5 while not breaking + things for automake 1.4. + Wed Oct 10 12:48:38 2001 Owen Taylor * gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, ""). diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ac9a9e96d6..1cc7cce3c3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-10-11 James Henstridge + + * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so + that gtk+ can be built with automake 1.5 while not breaking + things for automake 1.4. + Wed Oct 10 12:48:38 2001 Owen Taylor * gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, ""). diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ac9a9e96d6..1cc7cce3c3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-10-11 James Henstridge + + * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so + that gtk+ can be built with automake 1.5 while not breaking + things for automake 1.4. + Wed Oct 10 12:48:38 2001 Owen Taylor * gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, ""). diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ac9a9e96d6..1cc7cce3c3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-10-11 James Henstridge + + * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so + that gtk+ can be built with automake 1.5 while not breaking + things for automake 1.4. + Wed Oct 10 12:48:38 2001 Owen Taylor * gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, ""). diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ac9a9e96d6..1cc7cce3c3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-10-11 James Henstridge + + * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so + that gtk+ can be built with automake 1.5 while not breaking + things for automake 1.4. + Wed Oct 10 12:48:38 2001 Owen Taylor * gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, ""). diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ac9a9e96d6..1cc7cce3c3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-10-11 James Henstridge + + * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so + that gtk+ can be built with automake 1.5 while not breaking + things for automake 1.4. + Wed Oct 10 12:48:38 2001 Owen Taylor * gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, ""). diff --git a/configure.in b/configure.in index 91fd26cc9c..78bea98e2b 100644 --- a/configure.in +++ b/configure.in @@ -102,6 +102,12 @@ AM_CONFIG_HEADER(config.h) dnl Initialize libtool AM_PROG_LIBTOOL +dnl Set AS and ASFLAGS so that automake 1.5 will be happy +AS="\${CC}" +ASFLAGS="\${CFLAGS}" +AC_SUBST(AS) +AC_SUBST(ASFLAGS) + dnl Initialize maintainer mode AM_MAINTAINER_MODE -- 2.30.2